Skip to content

[SIG CLOUD 9] rebase custom changes to 5.14.0-503.29.1.el9_5 #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 10, 2025
Merged

[SIG CLOUD 9] rebase custom changes to 5.14.0-503.29.1.el9_5 #209

merged 1 commit into from
Apr 10, 2025

Conversation

PlaidCat
Copy link
Collaborator

Update process (This kernel CentOS base for 5.15.0-503)

  • Kernel History Rebuild Process for all src.rpms hosted by RESF
  • Create sig-cloud-8/4.18.0-553.40.1.el8_10 branch
  • Check if any maintained code is included in the new el release.
  • Cherry-pick all code from previous branch into new branch (skipping unneeded code)
    • Fix conflicts as they arise
  • Build and Test

Removed Commits

[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
- Commit 77cd727f669fcc8a95d57cff25c1ae3c8d95483d already present in new base branch: 77cd727f669fcc8a95d57cff25c1ae3c8d95483d x86/kaslr: Expose and use the end of the physical memory address space
- CIQ Commit 1347da8e14bc1b35373b6f9511dc44197cf4e586 already present in new base branch: 1347da8e14bc1b35373b6f9511dc44197cf4e586 github actions: Make Builds on Merge Request Work
[rolling release update] Removing commits from the new branch
77cd727f669fcc8a95d57cff25c1ae3c8d95483d x86/kaslr: Expose and use the end of the physical memory address space
1347da8e14bc1b35373b6f9511dc44197cf4e586 github actions: Make Builds on Merge Request Work

Technically this just leaves our update to enable HMM x86/kaslr: Expose and use the end of the physical memory address space testing this probably doesn't need to be carried anymore, but we should investigate later since it ONLY impacts Kernelselftest which is not distributed.

Build

/mnt/code/kernel-src-tree
no .config file found, moving on
[TIMER]{MRPROPER}: 0s
x86_64 architecture detected, copying config
'configs/kernel-5.14.0-x86_64.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4"
Making olddefconfig
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/confdata.o
  HOSTCC  scripts/kconfig/expr.o
  LEX     scripts/kconfig/lexer.lex.c
  YACC    scripts/kconfig/parser.tab.[ch]
  HOSTCC  scripts/kconfig/lexer.lex.o
  HOSTCC  scripts/kconfig/menu.o
  HOSTCC  scripts/kconfig/parser.tab.o
  HOSTCC  scripts/kconfig/preprocess.o
  HOSTCC  scripts/kconfig/symbol.o
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_x32.h

[SNIP]

  LD [M]  sound/xen/snd_xen_front.ko
  BTF [M] sound/xen/snd_xen_front.ko
[TIMER]{BUILD}: 1727s
Making Modules
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4+/kernel/arch/x86/crypto/blake2s-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4+/kernel/arch/x86/crypto/blowfish-x86_64.ko

  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4+/kernel/sound/xen/snd_xen_front.ko
  DEPMOD  /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4+
[TIMER]{MODULES}: 10s
Making Install
sh ./arch/x86/boot/install.sh 5.14.0-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4+ \
        arch/x86/boot/bzImage System.map "/boot"
[TIMER]{INSTALL}: 23s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-5.14.0-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4+ and Index to 2
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 1727s
[TIMER]{MODULES}: 10s
[TIMER]{INSTALL}: 23s
[TIMER]{TOTAL} 1765s
Rebooting in 10 seconds

Kselftest

$ grep '^ok ' 5.14.0-rocky9_5_rebuild-c9a24474a2ec.kselftests.log | wc -l
316

$ grep '^ok ' 5.14.0-jmaple_sig-cloud-9_5.14.0-503.29.1.el9_5-f6d894e8c2c4+.keselftest.log | wc -l
317

@PlaidCat
selftests/mm temporary fix of hmm infinite loop
f6d894e 
jira SECO-170

In Rocky9 if you run ./run_vmtests.sh -t hmm it will fail and cause an
infinite loop on ASSERTs in FIXTURE_TEARDOWN()
This temporary fix is based on the discussion here
https://patchwork.kernel.org/project/linux-kselftest/patch/[email protected]/#25046055

We will investigate further kselftest updates that will resolve the root
causes of this.

Signed-off-by: Jonathan Maple <[email protected]>
@PlaidCat PlaidCat self-assigned this Apr 10, 2025
thefossguy-ciq
thefossguy-ciq reviewed Apr 10, 2025
View reviewed changes
Copy link

@thefossguy-ciq thefossguy-ciq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚤

@jdieter
Copy link

jdieter commented Apr 10, 2025

@thefossguy-ciq, do you mind making sure you've approved the review? At the moment, it looks like you've just left a "ship it" comment without an official approval.

@jdieter
Copy link

jdieter commented Apr 10, 2025

@bmastbergen, since @PlaidCat is out, do you mind if I go ahead and merge this? I'm working on the dist-git side of things.

@jdieter jdieter changed the title [SIG CLOUD 8] rebase custom changes to 5.14.0-503.29.1.el9_5 [SIG CLOUD 9] rebase custom changes to 5.14.0-503.29.1.el9_5 Apr 10, 2025
@bmastbergen bmastbergen merged commit f711a97 into sig-cloud-9/5.14.0-503.29.1.el9_5 Apr 10, 2025
4 checks passed
@thefossguy-ciq
Copy link

@jdieter sorry my bad, I thought I clicked on "approve" instead of "comment." But for the record's sake, I approve.

@PlaidCat PlaidCat mentioned this pull request Apr 10, 2025
Merged
@PlaidCat PlaidCat deleted the jmaple_sig-cloud-9/5.14.0-503.29.1.el9_5 branch July 11, 2025 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thefossguy-ciq thefossguy-ciq thefossguy-ciq left review comments

@bmastbergen bmastbergen bmastbergen approved these changes

@kerneltoast kerneltoast Awaiting requested review from kerneltoast

@Kemotaha Kemotaha Awaiting requested review from Kemotaha

Assignees

@PlaidCat PlaidCat

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@PlaidCat @jdieter @thefossguy-ciq @bmastbergen